From: Florian Müllner <fmuellner@gnome.org>
Date: Fri, 3 Jul 2020 15:28:45 +0000 (+0200)
Subject: shell/window-tracker: Minor simplification
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~684^2^2~177
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=bf47d1b22db3c96009cb6e0e41a0cf5aba04425f;p=gnome-shell.git

shell/window-tracker: Minor simplification

Switching to autocleanup gives us a better separation between the
app/no-app cases.

https://gitlab.gnome.org/GNOME/gnome-shell/issues/219
---

diff --git a/src/shell-window-tracker.c b/src/shell-window-tracker.c
index 0474f0014..8e17f2deb 100644
--- a/src/shell-window-tracker.c
+++ b/src/shell-window-tracker.c
@@ -214,7 +214,7 @@ get_app_from_id (MetaWindow  *window,
 {
   ShellApp *app;
   ShellAppSystem *appsys;
-  char *desktop_file;
+  g_autofree char *desktop_file = NULL;
 
   g_return_val_if_fail (id != NULL, NULL);
 
@@ -223,10 +223,9 @@ get_app_from_id (MetaWindow  *window,
   desktop_file = g_strconcat (id, ".desktop", NULL);
   app = shell_app_system_lookup_app (appsys, desktop_file);
   if (app)
-    g_object_ref (app);
+    return g_object_ref (app);
 
-  g_free (desktop_file);
-  return app;
+  return NULL;
 }
 
 /*